Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 29 May 2010 09:39:12 +0000 (09:39 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 29 May 2010 09:39:12 +0000 (09:39 +0000)
commitdd51e386f79022dbc172122479b93c9f1c05b91f
tree18a3491a963bf1e0d45a9a7501ef94e1e30767d5
parent1469628e37712d9f1b96ca79a93fd94d8d0eee56
parent088af584c3ea7c152d7b84416272f081ef9cbd34
Merge from mainline.